Identifying Conflicts During Structural Merge
نویسنده
چکیده
This paper presents a model for controlling the evolution of documents concurrently developed by teams of authors. Optimistic check-out of revisions and alternatives, and hierarchic merge making use of default rules is presented. In particular the different situations occurring during a merge of parallel development lines and the benefit of storing the full evolution history is discussed.
منابع مشابه
A STEP Entity Control System for Concurrent Engineering
The STEP Entity Control System for Concurrent Engineering (SECS/CE) is an archive and version control system that facilitates concurrent engineering by allowing engineers to merge concurrent changes, find conflicts between concurrent changes, ask questions about the contents of changes and designs, and resolve conflicts between design versions produced by concurrent changes, during the design o...
متن کاملQuantifying and Assessing the Merge of Cloned Web-Based System: An Exploratory Study
This paper presents an exploratory study that analyzes the complexity to integrate existing merge conflicts of a cloned large-scale web system. The study is supported by an existing tool that focuses on the identification of merge conflicts that can arise during the integration of cloned systems. The approach addresses the merge conflict analysis through the extraction and comparison of the iss...
متن کاملCollaborative Merge in Distributed Software Development: Who Should Participate?
Merge conflicts, which are rather common throughout the process of software development, are more frequent and complex to resolve when using the distributed software development approach, where developers are geographically dispersed. Normally, in the case of workspace merge, the last developer to merge code is responsible of conciliating the changes made in parallel and resolving conflicts. Ho...
متن کاملThe Case for Batch Merge of Models – Issues and Challenges
Modelling is a fairly mature technology that is already being adopted by industry. Unfortunately the tools for supporting Model-Driven Engineering are not at the same level of maturity. In particular merge tools that are an important help for collaboration lack a lot to be desired in providing the support that is needed on industrial projects. Current model merge tools and research approaches f...
متن کاملAn Empirical Examination Of Code Smells and Their Impact on Collaborative Work
Background: Merge conflicts are a common occurrence in software development. Researchers have shown the negative impact of conflicts on the resulting code quality and the development workflow. Thus far, no one has investigated the effect of bad design (code smells) on merge conflicts. Aims: We posit that entities that exhibit certain types of code smells are more likely to be involved in a merg...
متن کاملذخیره در منابع من
با ذخیره ی این منبع در منابع من، دسترسی به آن را برای استفاده های بعدی آسان تر کنید
عنوان ژورنال:
دوره شماره
صفحات -
تاریخ انتشار 1994